BUG: cherry-pick fix from 9cf45ce72c and add test from #61675 #62781
+51
−1
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.